Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Updated CODEOWNERS #26631

Merged
merged 3 commits into from
Jul 26, 2021
Merged

chore: Updated CODEOWNERS #26631

merged 3 commits into from
Jul 26, 2021

Conversation

ChillarAnand
Copy link
Contributor

No description provided.

@ankush ankush added backport version-13-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. labels Jul 26, 2021
@pateljannat pateljannat self-assigned this Jul 26, 2021
@ChillarAnand
Copy link
Contributor Author

Looks like there are couple of flaky tests and they are failing. Re-running the jobs.

chore: update code owner for education module
@pateljannat pateljannat merged commit bfec493 into frappe:develop Jul 26, 2021
@frappe-pr-bot
Copy link
Collaborator

The backport to version-13-hotfix failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport/version-13-hotfix/26631 origin/version-13-hotfix
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x bfec49376df5d8f560a31e2d98f38d0d26cf1e4b
# Push it to GitHub
git push --set-upstream origin backport/version-13-hotfix/26631
git switch main
# Remove the local backport branch
git branch -D backport/version-13-hotfix/26631

Then, create a pull request where the base branch is version-13-hotfix and the compare/head branch is backport/version-13-hotfix/26631.

asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport version-13-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants